From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 2 May 2013 07:29:36 +0000 (+0200)
Subject: x86: call unmap_vcpu_info() regardless of guest type
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6934
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=9626d1c1fafe2da5af6e59478c9e9db6d03144df;p=xen.git

x86: call unmap_vcpu_info() regardless of guest type

This fixes a regression from 63753b3e ("x86: allow
VCPUOP_register_vcpu_info to work again on PVHVM guests").

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Sander Eikelenboom <linux@eikelenboom.it>
---

diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 14b6d13d88..3e09f58279 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -2013,8 +2013,12 @@ int domain_relinquish_resources(struct domain *d)
 
         /* Drop the in-use references to page-table bases. */
         for_each_vcpu ( d, v )
+        {
             vcpu_destroy_pagetables(v);
 
+            unmap_vcpu_info(v);
+        }
+
         if ( !is_hvm_domain(d) )
         {
             for_each_vcpu ( d, v )
@@ -2025,8 +2029,6 @@ int domain_relinquish_resources(struct domain *d)
                  * mappings.
                  */
                 destroy_gdt(v);
-
-                unmap_vcpu_info(v);
             }
 
             if ( d->arch.pv_domain.pirq_eoi_map != NULL )